merge r26230
authorJo-Philipp Wich <[email protected]>
Fri, 18 Mar 2011 18:28:36 +0000 (18:28 +0000)
committerJo-Philipp Wich <[email protected]>
Fri, 18 Mar 2011 18:28:36 +0000 (18:28 +0000)
commita1a860e174ee54bc11a44204ce4ccc9512c77d51
treeacbbbb5b0650b73091c8a88024ebca811d60d7c4
parent9922b1fbe660e5016eb53b573bf541b3fd060b8d
merge r26230

SVN-Revision: 26231
package/base-files/Makefile
package/base-files/files/etc/hotplug.d/net/10-net